Revert bdb6d12 and add test case for listeners #56282
+17
−12
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.